changes to get away from django