Added some of Cassidy's stuff