Added ability to have compact form or not.