Completed tasks #34 & #35