merged and working