changes made by Pinguy