Logic completed - v.1