Should fix issues 2 and 3