Switched to propel2 completely