(new) improved lots of code