add my code from before