Revised implementation and fixed launch notification handling.