Organised to functions

Not working