Improved and finished