Fixed and finished