working prototype
some adjustments