Updated with last changes from alice