Made few more changes to main partial