minor update, prepare to implement more