actually added stuff mentioned in previous commit