Improvements related to feedabck from Alex