some updates on 23-03-14