needed more strictness..