fixed one issue, so now its complete