Implemented 16/18. Fixed mistakes.