Some Minor change + fixed output