ADDED SOME ERROR SHIT