Updated with new information
Bugged recommitted