Slight updates to code