removed unused parameters
more proogress
better naming