Add main fill and some other funceitons