lifecycle managing fixes were added