WORKING new variant of design

fixes under the hood