Bug Fix + new Features