removed weird $ shortcuts
merge