Improve my study side infrastructure