(Hopefully) final version (using table for rhs positioning)