my manual merged from develop