Changed stuff slightly