IMproved and added some stuff