Added the suggestion of elitegamedev + some other small changes