FINISHES MVPPPPPP
fixes problems