Working code without bonus