Making final changes for it to work