Changed some stuff for my needs