Updated to work with Neat