Fixed Transaction I think and dropped classes