working base version
finalized patch work - all assets to be prepared