Finishing changes. Not working yet