removed complexities
removed more complexities, works completely.