Updated with last commits