Saved state and status update, credits to @rimusz, at #169