Added custom callout
Various changes