Code

Updated for backwards compatibilty - part II