added a variety of changes and it still doesn't really work