Removed luminoosity and bugs correction