added various changes