Martyna's requested changes; no does sound and extra light source as well