Version 7 Merged 4&6