Removed need for extra file