added some stuff :P