Fixed all known issues. Looks like work good