Merged ItsHertz' changes