Removed curb dependency