changed a bit
merged some stuff and changed a bit