first clean up / added new stuff