Version 2

logic #18