more stuff local
added rotation