Changing the functionaround so it works