I think should be this way for consistancy