Update and Bug Fix