Improved and documented prototype