updated for loading.. and ScopeProperty issue