some changes migrated from live site