small changes on source