fix2

forgot some things that Abhinav1997 authored :)