ready for capstone
conflicts merged