Further work on Character controller