Edit working

Need to make it better now