Final tweaks on WORKING prototype