merged and testing