Changed the output assembly a bit