Reverted last changes as they were not complete