Commented and added default language