added "ends here" for marmalade