Fix functioning and remove use of instance and seperate functionalities