Modified according to old project