Includes all changes from galaxyfreak's nad sachin's sources