Merges from school project