With little bug fixes on Main system