added all funtionality (auth elements removed)