added more stuff (no time!)