Made things more Dynamic