Closed #560, closed #559 worked on #512