Working but too buggy