Committed minor changes - stuff to be tested