Edited Some features