Changes according to s1monw's review