Major changes - added IDP Hardcoded stuff