Well done, fixed the bugs!