Added header and new methods