Updated to ensure it will work properly with FunkyBot