Address part of Bikas' comments