Fixed a bug in method includes. Simplified the code.