Still need to fix small programs