forgot to rename some var names