More revisions(Still need to fix issues)