some fancy changes

some fancy changes