merge
start implement change functionality