Fixed and added