Adds Jaemar's whatevers