//Fixed few bugs