bugs removed!