Added most of discharge ability