final changes woohoo