Added code for future use and views