updated for amanda