removed question mark functions, hopefully didnt break anything