Improved and Fixed example