more changes to accommodate for multiple languages and using blocks