added some more changes ~