Logic part finished