Added estra options. Needs testing