ADded Fixes