added hot loading