Final code before sunday submission