Added first part of resolved issues