updating some of changes Anthony wanted