proper merge with previous commits with Chris