Propused changes to allow for easier development