Commented old code for future implementation