adding before and after options
to be moved later