removed buggy portions of the code.