Tried to add some stuff but went buggy :(