Final code before testing