Added more interactions and improved old ones