Moving appendix A to appendix D