Now working, fixed bug