changed interface to neutron, fixed key conflict error from make