Suzanne added and code cleaned