daniel's merged changes