everything updated for new method and layout