[Investigatin] Working but not fully