Reverted last commit because not client friendly