Jothin's changes