okay, improvements based on kai's feedback :)