making some changes i like!