implemented some new stuff