Update from Jumperalex
jumperalex's tweeks