changed a bit

needs a big update, though