issue solved, cleanup, news implementation