changed dollar input
fixed merge changes