#505 revised features