Color added, bug fixing