No longer using ENV Variables