Fixed and added pass through