Fixes and front logic implementation