aded working stuff